Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 11 Jan 2010 07:37:07 +0000 (08:37 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 11 Jan 2010 07:37:07 +0000 (08:37 +0100)

Trivial merge